Added More statistics and fixed makefiles