more homesick related changes