bullet point fix and remove unlist everywhere
Merge remote-tracking branch 'origin/master'