merge developments from OWS; some dependency restructuring