fixing comment args & more
unifying text domains