A series of changes by Tanya, Emilio and Todd.

As reported by Tanya, this commit fixes the following tickets:
Related #85
Related #91
Related #92
Related #100
Related #101
Related #103
Related #104