Added some more, cleared up some terminology.