A lot of fixing done :)