Maintenance Update

Fixes for:

• Issue #165
• Issue #166
• Issue #167
• Issue #168
• Issue #169
• Issue #170
• Issue #171
• Issue #172
• Issue #173
• Issue #174