Changes to makefile and labspec