refined a bunch of argument readers
fixed locker commands
Merge branch 'origin/master'