minor tweaks, save still not working