Feature/feedback

Pulling in improvements for #212 & #268 into develop.