fixed last bugs