Database and some wrappers fixed - login complete