Improved installer and fixed few bugs