Debugged the addition and removal of features

Added some debug handles to the citizenMap return object to allow for
testing.