fixewd up minor changes