Fixed up few stuff login stuff etc