Re-started work; fixed minor compatibility bugs; updated TODO list