Misc improvements (draft for async updates)
docs