Some comments and fixes