some order and header fixes