lotsa icon improvements, etc.