cleaned up templates, updated various form-related