Fixes and commentaries