Updates to use new API, extended features

Up to you if you wish to pull this and then update your BukkitDev page :)