some small changes..