Done some fixes, still a lot to do