Fixes & update to login method, better validation, etc.