Some tweaks and a save command