I've in fact rewritten the tool from scratch; rm old files