Clean up commenting code.  Wait for annotation id to be returned before adding to sidebar.  fixes #65