[TASK] Last polishing - ready for beta release after this

NOTE: Merge this one last; it might very well require a rebase before you can actually merge it.