Making installer more fine tuned
Cleaning up some code