many places small - small changes