fixed all uncertainties :)
cleanup