CR feedback and a bugfix