Minor fixes; new Form for Tom