Removed need for admin rights, some minor fixes