more fixes but not ready yet