better comments, put back in working code