minor tweaks
reduce memory requirements