[WIP] more improvements