#135(partially), various fixes and work on the skip system