Fixed up some things
Fixed up some things