sub1 few issues fixed