db changes and fixes in models to corecct those