Upgraded ORM/Model lib, with more features + some light cleanup