Feature/929 household and opps and other important bug fixes

# Warning

# Info

# Issues
Fixes #929 
Fixes #951 
Fixes #988