I felt like making some changes.
(more soon, of course)