Extinction bugfix/comments (2)

Last commit was wrong due to renaming