Sateraphim

Thank you! Most of it looks good now but I'll leave this issue open in case the maintainers will find a way to fix number 4.