AddThis integration and minor fixes in macroses.