Removed TODOs and updated demo link