fixed all the junky errors - we really need a more tightly coupled orm