fixed various inconcistencies and typos