minor changes. I think its done