bug fixes, minor updates