Reduced warnings

This branch addresses a number of things that generate warnings.