Integrating whiskers

Editing wave arms, and other files to integrate whiskers into the main
program
Fixing up re-changes