small patches
merge with andrew