Update docs, add a bit of comments