Latest works

This PR is good to merge, but hardly reviewable as it alreay is a merge of clochix's and my work this week.