composite keys, misc cleanup