Lots of small changes and drafts
Merge commit 'fb31b2a8bf902f150b10d18527d0e5c4b4aac119'