update8

minor fixes, preparing for more big changes