Allow people to send metadata with activity and fix a bug (#649)

Allow people to send metadata with activity and fix a bug (#649) #510