cleaned up comments and old code, added Database object to server