bug fixes, minor progress