cleaning up some forms, added ability.rb