solved a few issues