Changed a LOT of suff in many functions :)