some tweaks, i guess