More work on archive, updates to environment and dotfiles