Added checks, tidied up and removed multiple shape requests
Sorted out whitespaces
Added more output to track down failures