Adding dwt and mra types
Minor bug fixes
Other minor fixes.
Additional minor tweaks, tests do not function due to addition of types.