added additional 2-gram features
added debug message
removed redundant case