Fixed mmany things