merging in matche changes from master, tiny cleanup in framework