some final changes....