Fixed some errors + added new mean/median