Still not right but there are quite a lot of corrections