ORM bugfixes and better nested saving method