in the middle of changes
made it load all files, fixed line jumping errors