minimal commenting changes and some new maprule bullshit