some tweaks and revisions