Combined fixes and updates

The goal or this PR is to come closer to the original and to fix bugs. These are fixes for missing semicolons, indentation, comments that shouldn't be comments, typos, comments which are different in upstream, the order of imports and list items. Every change - is committed separately so it is easier to understand - comes from upstream and is not my personal preference