Remove unused things and fix error
Reorganize parameters
Fix error and load only good lines