cleaned up some complex value issues