lots of minor changes
ignore..