Fixed up a few things and allowing people to change the database