optimizations
fix for encampments
merging