some smaller tweaks