minor syntax and some todos in model