added some tweaks.