merge 10 attempted changes for v1.0