exceptions imporoved, plural and separator added