Added fix for too long Identifiers and Integers; also fixed two bugs in the buffer.