fixed console
upstream
fixed checkpoints(upstream)
fixed some warnings