Update Makefile to include seperate headers, adjust buffer read to display properly