Lots of small changes/fixes. Mostly the result of local running & Intellij analyzer (the ones that made sense only)