Fixed all 1.6 bugs, minus textures