shorter intro and other tweaks