Misc changes. Makes some checks stronger, some weaker, eliminates false positives for ramps, and minor reorginization.