Your proposed modifications sound really good - nice work! I'm looking forward to playing your final product.