changed back to original span lab packet format and update makefiles