merge changes from hsjfreeman
portable prompt; omit local host