fixed some errors from previous commit