working on multiple values, cleaned up some