debugging almost done...