fixed db associations,update controllers,& views