added helpers, tweaking the shelter map