Cleaned up a bit; edited value labels