small updates
merge with brian's latest