Some clean-ups and added fire_octupus_green