final touchs to fix bugs