[WIP] fixes