Another commit.
Got some corrections on sunday night.