added friendly collisions
added 'wave' test