Update for Minecraft 1.6.1, still buggy