fix broken checks, style refinements