Did a few fixes ( I think)