Just fixing some warnings

Nothing important, but members should appear in the initializer list in the same order that they are declared.

Still working on it