2.2.4 Release

Bug fixes, enhancements, code cleanup and beautification.