Fix for forms
Fix class comments