Fixed up database a little bit