add homeshick, various fixes