.more fixes