fixes and rename