Updated comments in code according to the latest changes, fixed a couple...

... of typos