Clean-up of encoding handling, comments
Comment tweaks, off_t used