Added random mode. Also merged gap flag into the options hash for Site.