bye on changes, minor adjustsments