Correcred some issues