don't need this anymore
reorder this check
tweaking this to make it C89 and such
some new tests