Found bugs in punch and reader routines