minor fixes: regexp, ordering