Fixed Selection off by one.
Fixed merge conflicts