More logging

Additional logging and capturing of analytics for #15.