Very format + bump to new Bukkit version
Better instance handling