Updated database, changed some names and moved things around