merge in wip from dev
update gitignore
simplify temp mem