Added more fields and fixed some database fields