Removed several checks and configured a few checks.
Merge remote-tracking branch 'upstream/master'
grading scheme changes, might not compile