some errors still need fixing