Implementation continues; bugfixes, etc.