Made many general improvements. Added user account functionality