fix/remove cwd, more wtf