Fixed Makefiles + report sorting