Improved file reader and added tokens for ++ and --.