modified models, forms, views and broke a few things; getting syntax errors in views at the moment