fixes / async loading