Lots of small tweaks from SensioLabs Insight.