More comments
Small bug fix