Made a lot of other changes

I made a lot of other changes and fixes including file ending fixes between different platforms and a unified Maven output along with several class corrections, improvements, and fixes. This had made a large number of merge conflicts. I would fix them but I'm not sure which parts you want to keep since some of it is your code and comment modifications.