fix home and bugs