[UPDATE] Dramatic performance boost

…and other fanciness