fixed some ruby 1.8 -> 1.9 issues, improved visual
merged