More kbd/samp/pre/code stuff ...

Closes #24 and closes #23.