minor cleanup to comments, logging
fix old/new index mismatch between log message and action