fix bug + comments