finish fixing renaming problems
get things functional again
update todo