more updates. minor fixes.