Bug fixes and separating settings into Config.persistant variable