FInal tweaks, good to go