improve install / uninstall feature and fix few issues