Merge updates directory

Also, sets the env for thandy to work properly.