Fix for Issue #24

options begin, end, offset and the file directive should work as desi…

…gned now

... last version wasn't exactly perfect, unfortunately.

begin and end options didn't work correctly

Plus some small cleanups to keep gcc quieter