added bullet component, and cleaned up heaven a bit
and hell
merged yours with mine