minor cleanup
merging stuff from master