A few changes in an attempt at sanity.