Update commenting and some console info