minor tweaks + preload