some small changes...