fixed first bugs