Minor tweaks. Fatal instead of panic, whitespace adjustment.