miscellaneous work

patch up works