Lots of bug fixes

Fixes #1455, #1435, #1353, #1481, #1487, #1490, #1280, #1489, #1480, #1474

Applied all the spigot patches closing #1488 (thanks Sirse, I already had most of them coded though)

Maybe fixes #1417 (spigot patches)