[NTheEndAgain] Add #168 and fix #214
[NTheEndAgain] Add #191
[NGeneral] Add #209, needs testing