Added /pumpkins and /esphere, plus some optimizations