further minor fixes to hamster.rb