[@Gryphonis] done a couple, will do some others later