Revert optimizations
Fix / on makefile lol
Update config