Clean up of percentiles and fixing problem