[MOD] improve performance, async calls, minor style chnges