updated, minor changes...