small fixes to home
other small fixes
merge