RUBY-18

cleanup logging and more