* minor tweaks and fixes