add wave fom scanner, some new featues + cleanup