bug fixes, reporting additions,msftidy cleanup