v21 fixed, v03/4 minor changes