Fixes

Mostly stylistic, correct a couple of return types.