Still a few issues

Still a few issues