Fixups

Got this working with the latest CraftBukkit, cleaned it up and fixed some bugs.