fixed problems.....-.-