Beta 21
Polished some stuff.