Made settings handle the storing of volume levels
Minor testmap changes