Some fixes. Temp moved files out.