Minor minor changes to controllers.

Will work more on package_controller.rb and refactor the code to make it more
manageable.