Made the $PATH stuff optional.