Bug fixes - started work on login system