Finished uncoverField and various clean ups