Elementary circuits: some fixes and stuff