Some basic edits and DB hookups