*Fixups per Haacked's request.