A few changes and improvements to bmp_top and our test file