Cleaning up a bit; Some work on fields