Minor Revisions and Updates

A few bug fixes