bug fixes in v3 and engine mapping