minor fixes
Merge branch 'newhome' into testing