Lots of corrections and regularisations
merge conflict fixed