Some comments and proper incrementing