Removed zombie code.
Fixed doc, setup added missing segment.
Updated to new format.