oops, fixed some errors