-Bugfix for "edit" feature
-Some minor idiomatic ruby fixups