random changes and tweaks