minor fixes, need more