Upgrading to Cedar-14
small tweaks