Bootstrapping Home + other changes