minor fixes and rename