Ajusted spaces and other little things

Nothing major changed for now. Just to note though that this isn't currently working... the previous author should review all this code. I'm trying to review it, but seems to be a little more complex that I thought.