fixed some stupid mistakes, clipping issue still there