some tweaks, still testing