Fix drop heads from creeper

minor cleanup as well