re-organise header
+++fixes