Changed files to use admin installer, fixed some bugs