Some fixes and a start with save and load functionality