Commented code, bug fix