Add wasp hives and more improvements