Cleaned up code, consolidated checks, and marked the site responsible for the f18 bug