history options, and fix home path
merge