Some comments and some small fixes