updated
fixed problems