merged most changes from GDocs convo