Updated documentation, cleanup,
moved PortMap.