Finalizing last commit, -> cleaned up some warnings and made main.cpp linux compatible