final tests and tweaks