Fixed some data entry problems