Signe did this one. Marked task as done and fixed some comments.