a few more tweaks to reduce file size