Additional Changes to Comp

Also added better images for circuits