A few fixes and a changed comment style