fixing up mistakes