minor improvements
merge
bug fixes