So many fixes :)