Fixed bugs in function reconstructor
Fixed bug in function reconstructor
Added TODO list