Fixed the shipping selector bug and cleaned up the code.