commit last changes
various changes