small tweaks
Lots of small changes