Working on fixes and empty final line