Made various minor tweaks in a number of areas