some tweaks and fancy