Lint Fixes

one is an undefined case. I'll return to this later.
First try. Works in windows shell, not MSYS