Fixed long-standing indentation bug
New form HTML tags
Added additional typechecking locations