incremental fixes pushed so i can upstream pull