Changed TODO and some fixed reference error