some minnor fixes;