small design tweaks
Merge pull request #107 from gvn/designtweaks

small design tweaks