Fixed long lines
Added TODO:s