small changes and tweaks