[WIP] fixes for AN