Enhancing works

Adding this and that, fixing this and that, and I forgot to commit each
of’em. Cursed!