some minor changes
some minor fixes