comments :tea: and bug fix