added exceptions to comments