few minor changes...