testing out joints for cactus bomb
merging with heaven's code
minor bugs fixed from previous commit