fixed some errors in previous commit