Redone a little bit

A few of those errors are gone.