Fixed a lot things :-)