fixes and clarity