#67 resolved all warnings, mostly adding getters for unused variables