Dev

@kieve: Should be stable enough to merge to master, do you think?

Still a few bugs, but mostly minor ones.