bug fix, some standardization