corrected bugs - removed all of the .all things to current_user things