minor fixes, format improvements