updated for jhead

LOTS of changes!