some random changes
resolved merge conflicts
cucumber regression test passing
bugfix cleanup