improvements / corrections