Fits are now working, stuff running more smoothly... progress