Polished up the waveguage module
Polished up the waveguage module