daniel more fixes