Bugs seen by now all removed.