Fixing core issues from a bad compile. There are also new commenting and tagging requirements.