added some prefs
added ability to save level
merged