more specs + some changes to models to make specs pass. 5 specs failing right now