handled a few errors
Fixed some errors
Fixed some errors