made some tweaks and suggestions