just some tweaks