Changed a bit more

Too many commits, so sorry