Fixed bugs with marker display. Old markers are now resused. Internal default shelter count stored. Removed various debug checks. Cleaned up code.