Removed some abbr., clarified stuff