Fixed formatting and hamza and wasl