Update 0.21
Mostly internal changes