minor changes & improvements