fixed password mod bug, added comments
merge Dec 16