Updates

rebase from upstream + hardcode temp dir