Login Fixes, (username -> email), Cleanup, removing un-needed future, indention fixes