Clean up, minor adjustments to block forms

Version 3.11.0