final tweaks for final iso ;-)