final tweaks and validation