Added block weight validation and automatic re-org support.