Fix/solvberget feedback

Closes #239