Maintenance Update

Fixes for:

• Issue #240
• Issue #241
• Issue #242
• Issue #243
• Issue #244
• Issue #245
• Issue #246
• Issue #247
• Issue #248
• Issue #249
• Issue #250
• Issue #251
• Issue #252
• Issue #253
• Issue #256
• Issue #257
• Issue #258