db  model fixes
major orm fixes - a was so dumm