Some tweaks to output, page range validation, and removed unneeded code