some minor changes
merging master