staging fix

still need scores to be displayed
exceptions to be caught
performance to be improved