Numerous changes that only affect the source code. Just cleaning things up really. Couple of error fixes with previous code not being pushed.