fix a ton of bugs (2 still left as an exercise)

[rofl0r]

[rofl0r]

i'm aware that @antirez won't merge this, i'm putting this here so other people can cherry pick bugfixes or at least get to a state where everything apart from long lines mostly works as it should