I'll make a PR against your branch with some of these changes, it's easier than commenting on them all.