Add infinite plane, and some other fix