cleanups/tweaks