Plenty o' bugfixins