Added many fixes