some errors from b.s. fixed