Slysven main development

Stephen's commits, only with a rebase. The content is the same.