minor fixes, changes