started integration, fixed Makefiles