Tweaks - ready for public review