Lots of Model & MongoDB procedure fixes