Add remaining alex-z changes
17 files changed