settlement fixes for new feature
build