added channel, refactoring wavelets