Fixed a few minor issues with clipping prevention. I think I am finally pretty happy with it.