minor changes
change keys done and load/save still buggy