Managed capacitors, made some cosmetic improvements