rearrange some stuff, resolve package warnings