Circuit

Bug fixes and refactoring.