Added another couple of unit tests. Changed a few things around and added some notes.