replaced issue() with a macro and fixed some comments