cleaned up TODOs; tested clone