various uncommited changes