Profile and cleanup (way more than expected)

Incorporated the new parameters in the visualisation and changed household test script to work with the new methods. See commits for the rest of the changes.