ISSUE-3 Added removal and returning of prisoners.  Also cleaned up all warnings.