A few random changes, started work on genericizing temporary
file/directory creation