Fix working dir
Fix comments
Rollback to the correct WORKDIR and fix comment