A few fixes here and there

Nothing important. Visual eye candy for the code and a few loops.