Made changes to the makefile and stockview