#95 misc work