Completed command generator updates.  Small updates throughout other files.