some minor tweaks and improvements
some minor tweaks and improvements