Addressed: #587, #590, #594, #596

Addressed: #587, #590, #594, #596