bugfixes

bugfixes in collission and simple testing