Remove undefined argument passed to save and a few minor tweaks