More comments and debugging