Added some stuff...
Added -Wall option and merged main
Fixed conflicts