more async loading and spec fixes