Updated main,scanner,usercon and removed some comments