A lot of fixes

Line is too long. [98/80]