Comments and bug fix (incomplete)