add daniel / michas todos
adjust scale values
first third of todos from michael / daniel