Fix listener priority
Small code tweak
Use spigot