Version 6.21

Fixed many issues presented in 6.20.