Update for usage with Bukkit HP System, General bug-fixes