Feature/commentissues

Closes #465