clean up, special cases etc.