Correctly (but not properly) sized form
Minor updates