Add a bit more comments