Placate clang

There were 3 different warnings, shouldn't fix any bugs though. also I removed some inlined comments in the code... Poor form there...