performance tweaks
minor