fixed some typos and old terminology