Made more betterer several files.
Fixed merge issue. No biggie.