Added computer database, database connection conflict resolved, etc...