Fix #11 - make CC crawler visit more

* Also stop using a plethora of properties for markup in favour of one hash