Added some step/dir refinement

Signed-off-by: Seb Lee-Delisle <sebleedelisle@gmail.com>