last changes and code clean up
