final misc changes on master