some improvements/additions in inline functions and macros