1. Improve geometry

    Closed
    #176327324 0 12 0 0

  2. Mainly minor improvement to geometry

    Closed
    #176284183 3 13 0 0