fix last bugs