Cleaned up some stuff, put collision callback back