minor additions, and rub  command syntax change