Space issue marked fix. @Arthur2e5

I overwritten everything, sorry... really not good at merging code.