Finished configurable entity spawns, did a bit of cleanup