A few visual fixes and fixes at circuitry