reordering + fixes