additional clean-up; corrected some implicit type conversions and other compiler-warning related miscellany