Martin's code review changes, plus adding stripes