added a ton more to wavegen management