Various fixes to get this to work

allowing blanks; None != 0; etc