a few tweaks for cleaner packaging