* minor tweaks and changes