various changes tweaks etc.