more feature test macros pedantry
minor changes in output