update for docs and exceptions