improve few issues