refactor of env
tweaks
updated gitignore