some of the last changes

some last changes :dart: