some more tweaks using leader..
yeah starting to get nice..