implemented box box collision and did bug fixes