pr feedback and bugfix