Redone Collison and added Fricton

and some Testing-Changes and co.