Added build image and fixed headers.