A few bugs around JSON serialisaion and added a few more methods to delete thngs in context. Still a few more things to do, though