Changed shooting method, added waves, tweaked values