Lanecount branch has many small improvements over old master branch, let's merge