models + small fixes