reorganized some stuff around