Added 1.8pre blocks, other fixes