Minor chnages between setups
All tests pass, fixed minor items