dozens of fixes to pass checks... very handy