Shell code blocks, headers, other minor changes