last changes, bug fixed