Add remaining objects to object file, adjust Makefile