Better homeshick refresh; other minor edits