few issues fixed