major update: caching and renaming
update todo
notes
bug fixes