More stuff as I fix some error.