Minor fixes (addressed comments).