Fix comments and robustness