WIP: last fixes