fixed the easy issues from the revision, added more on D