Modified license and fix few issues
