fixed markup and updated collector.py from main repo