- modifications to accomodate new super mode
- some code cleanup