MAE writer and further improvements