last changes, done for now.