#922 Fixed more of the feedback