closes #473
closes #262
closes #248
Merge pull request #500 from OCHA-DAP/marianne-dev

This and That, random issues and bugs