added commenting, upload/streaming, and general fixes