Cleanslate

fixed models and updated database population script