Cleanups
Fixed check for parent dir when run though $PATH