Bundle o' Kindle tweaks!

Bit of a mess, but it's 5AM ;p.

Each commit should be self-explanatory, and this *should* be safe to merge.