minor updates
yet more cleanup