Added grammar module with minor checks