Some comments and extra debug info