Fixed errors
Updated form type
Updated entities
Added comment form type