few issues fixed.