Uncompilation

Fixed uncompilation and updated todo list