Better path handling and new option