Closes #9. Closes #10. Addresses some death issues seen on dev.bukkit.