Fixed segmap alignment for grow into, refactored expanding