more fixes but still not ready