Marianne dev

Misc issues