Made some small fixes and did notes in places