bfosterjr: minor fixes, added offsets