engine cleanup/tweaks