Fixing a couple of issues

and adding a few minor tweaks