Various bugs fixed that came up in production.
Move coverage to 100%.