minor adjustments
wooo lots of changes!