some more changes commited