More fixes and cleaup re. feedback