bug fix, clearer comments