FIX: Addressing Alex's misc comments