Final sweep

Went through the form for any lingering issues. 

This PR takes care of them.