Nightly Updates | v 0.2.21

Code cleanups, bug fixes and grammar checks