Minor tweaks

Adding a number of small fixes and tweaks.