removed name.rb
cleaned up some more, fixed the fact that the last element is being discarded.