Some docblock love
Added source to xml tokenizer, cleanup in collection process, minor performance tweaks