Home wake fixes :)
also fix recovery