Warnings so far fixed, more formatting