Multiple small fixes, from further testing
Still need to improve output from comparison failures