UPdate to cmake stuff, and collision stuff