Continued collision integration process, improved makefile