fixing the final bugs preventing merge - and really, this should work fine. running under ruby directly was fine, under rake, failed.. rubby