Home controller + small fixes