Final fixes - fixed bugs in TopTen and did some other cleaning up