update comments and fix issue introduced by recent changes