Misc work; cleanup