Lots of tweaks, improvements
Minor fixes, tweaks