Peeking at the peak: Bug Fixes

Several bugs have been fixed.