More --size/++speed from peterferrie!