continuing to fix issues pointed out by warnings
- all tests passed for this commit