misc chages & improvements