Added one or two new checks + some overall fixes.