last changes and cleaning up