Bunch o changes.. Mostly login stuff