Added section about short-circuit, improved script