still testing
ok mostly fixed..