fixing lots of things
fixing base.rb conflict