big changes

see todo.txt