more updates and framework cleanup