Implemented Kick and cleaned up Join

Implemented kick according to the specifications and simplified join a bit, as some of the map extractions were a bit more explicit than needed.