fix db queries and minor code cleanup
contact info