Add new spawn egg support and some bug fixes