Mainly dzen changes and gitshell