few little bugs fixed