fix handling of percentage symbols
handle null case, as well
Update docs