... FIXES... MANY FIXES :D