Fixed some bugs
Removed some uneccessary code
Update arg setup & hidden password