corrected a lot of bugs in results