Almost fixed clipping, will finish it tomorrow