Finished showing results, bug fixing