Fixed up cwd for arbitrary command types and improved make plugin