minor tweaks throughout the source code