switched to .Net 4.0, fixed some typos