The end is nigh

Fixes and fixes and fixes....