minor bug corrections+