more fixes
fixed revert conflict
fixed conflicts again
fixed login and re-added my ability to edit and delete projects while I refine this bugger