Fixed errors, updated database