updates

now it works. still a lot todo.