move some stuff to/from init file
fix