[#1472] WIP
[#1472] WIP
[#1472] WIP
[#1472] WIP
[#858] err msg
[#858] misc cleanup