minor changes
a lot of changes