try this now too
minor fixups