broken
mostly fixed things