updated TODO and make files, fixed version cache