Change to some varibale names, re-work to user defaults and cleaned up changing folder function