More fixes to avoid interpering variables as funs - basicly all
functions now have at least ()