fixed dumb bugs