Refactored the results window.. other things..