proper parameterized queries for object updates, more tests, remove some cruft