Poseidon!  Also a few small fixes.