Z offsets, comments/cleanup, and other details