Added return type reference lookup and fixed censor func.
Updated todo.
Fixed issue with parameter referencing.