fixes, moving some stuff around