Stack complete, updates to makefile