some more changes
some minor changes continues