last changes to clean up a little bit

Last changes....